Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge Beta 3 release branch into master #1542

Merged
merged 25 commits into from
May 16, 2016
Merged

Merge Beta 3 release branch into master #1542

merged 25 commits into from
May 16, 2016

Conversation

liujisi
Copy link
Contributor

@liujisi liujisi commented May 16, 2016

No description provided.

liujisi and others added 25 commits May 10, 2016 14:49
pbconfig.h has gone. This commit removes the target.
Fix protoc build artifact script.
This time move the macro inside namespaces; hopefully will work with the
integration script.
Fix the command line interface unittest again
Update version numbers for beta3
Added release notes for Ruby and JavaScript.
Update changelogs for C++ maps
As it may be implementation dependent.
Remove the comments about iterator validation
@googlebot
Copy link

We found a Contributor License Agreement for you (the sender of this pull request) and all commit authors, but as best as we can tell these commits were authored by someone else. If that's the case, please add them to this pull request and have them confirm that they're okay with these commits being contributed to Google. If we're mistaken and you did author these commits, just reply here to confirm.

@xfxyjwf
Copy link
Contributor

xfxyjwf commented May 16, 2016

LGTM

@liujisi
Copy link
Contributor Author

liujisi commented May 16, 2016

@googlebot these commits are made towards the protobuf repo, and there's no CLA issue.

@liujisi liujisi merged commit c8be6ee into master May 16, 2016
@xfxyjwf xfxyjwf deleted the beta-3 branch June 30, 2016 23:29
bithium pushed a commit to bithium/protobuf that referenced this pull request Sep 4, 2023
Merge Beta 3 release branch into master
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants